Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 31 Jan 2010 11:34:12 +0000 (11:34 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 31 Jan 2010 11:34:12 +0000 (11:34 +0000)

Trivial merge